Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing latest changes from devel for ceph-csi #306

Merged
merged 11 commits into from
May 29, 2024

Conversation

df-build-team
Copy link

PR containing the latest commits from devel branch

Madhu-1 and others added 4 commits May 17, 2024 08:24
The tests are failing due to missing
ruby-devel package in the base image

Signed-off-by: Madhu Rajanna <[email protected]>
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
The link on the README file to get an invite to the Ceph Slack was
missing a URL scheme, so it was interpreted as a relative link and
resulted in a 404.

Signed-off-by: Ben Tullis <[email protected]>
@df-build-team df-build-team requested a review from a team May 23, 2024 08:28
@Madhu-1
Copy link
Member

Madhu-1 commented May 23, 2024

@df-build-team am not sure how this PR is created, because the commits listed in this PR are still not present in the downstream devel branch yet, they are waiting to get merged #305.

dependabot bot and others added 7 commits May 24, 2024 09:27
Bumps the k8s-dependencies group with 1 update in the / directory: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).

Updates `sigs.k8s.io/controller-runtime` from 0.17.3 to 0.18.2
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.17.3...v0.18.2)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
dropping go version from the go mod
as we have x.y.z version for go

Signed-off-by: Madhu Rajanna <[email protected]>
updating kubernetes to 1.30 release

Signed-off-by: Madhu Rajanna <[email protected]>
update kubernetes and go version in api folder.

Signed-off-by: Madhu Rajanna <[email protected]>
changes as per new controller runtime import

Signed-off-by: Madhu Rajanna <[email protected]>
fixing logging as per new controller runtime
errors

Signed-off-by: Madhu Rajanna <[email protected]>
@nixpanic
Copy link
Member

@Madhu-1 it seems that the commits in this PR are merged in the devel branch now?

Maybe @Nikhil-Ladha can explain the process how the backport to a release-4.x branch is done, and how/when the sync_ds--devel branch is created/updated.

@Madhu-1
Copy link
Member

Madhu-1 commented May 29, 2024

@Madhu-1 it seems that the commits in this PR are merged in the devel branch now?

Maybe @Nikhil-Ladha can explain the process how the backport to a release-4.x branch is done, and how/when the sync_ds--devel branch is created/updated.

yes that true. it got merged later. unblocking this one for now.

@Madhu-1
Copy link
Member

Madhu-1 commented May 29, 2024

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Code looks good label May 29, 2024
Copy link

openshift-ci bot commented May 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: df-build-team, Madhu-1

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Its a good idea label May 29, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit ef4771a into release-4.17 May 29, 2024
20 checks passed
@Nikhil-Ladha
Copy link
Member

@Madhu-1 it seems that the commits in this PR are merged in the devel branch now?

Maybe @Nikhil-Ladha can explain the process how the backport to a release-4.x branch is done, and how/when the sync_ds--devel branch is created/updated.

The sync to release-4.x branch happens when we have stable build for that release.
In this case, it is 4.17.

It syncs the commit from devel/main to the release-4.x branch.

@Madhu-1
Copy link
Member

Madhu-1 commented May 29, 2024

@df-build-team am not sure how this PR is created, because the commits listed in this PR are still not present in the downstream devel branch yet, they are waiting to get merged #305.

@Nikhil-Ladha that was my expectation as well but that's not the case, even as the changes are not merged to devel branch got added to the release-4.17 branch as well.

@Nikhil-Ladha
Copy link
Member

@df-build-team am not sure how this PR is created, because the commits listed in this PR are still not present in the downstream devel branch yet, they are waiting to get merged #305.

@Nikhil-Ladha that was my expectation as well but that's not the case, even as the changes are not merged to devel branch got added to the release-4.17 branch as well.

Oh ok, in that case it seems they are using upstream devel.
Will update the ref in the builds to use downstream devel instead, then we won't see this issue again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Its a good idea lgtm Code looks good
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants